merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 10 Nov 2010 07:29:25 +0000 (16:29 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 10 Nov 2010 07:29:25 +0000 (16:29 +0900)

Trivial merge